Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 00:35:58 +0000 (17:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 00:35:58 +0000 (17:35 -0700)
commit26ed2948ed1e74157cb448ba34e326f403cf03e3
treedcb48586dee5ab58ceab9f73c4036cb3fea908ed
parent39698ab13439051cdfd3fc90e61a35e0ebb263ca
parent68be74b0a5c9cdac93f4f1d19760925dd3d264ed
Merge from trunk.
src/ChangeLog